Don't match C++ template delims starting within a token. FIxes bug #28418.

* lisp/progmodes/cc-engine.el (c-restore-<>-properties): After failing an
attempted match from the start of a token (in particular, "<<"), move to the
next token rather than the nex character before searching for the next "<".

diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 5ac4a76933724bf3909f0ac88b39f867fbe8d202..9ea0b2046a6753428746148ca6c9e8987a8fd34e 100644 (file)
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -6418,7 +6418,7 @@ comment at the start of cc-engine.el for more info."
                              (not (eq (c-get-char-property (point) 'c-type)
                                       'c-decl-arg-start)))))))
       (or (c-forward-<>-arglist nil)
-         (forward-char)))))
+         (c-forward-token-2)))))
 
 \f
 ;; Functions to handle C++ raw strings.